Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

freyja 1.4.3 with update #656

Merged
merged 6 commits into from
Jun 7, 2023
Merged

freyja 1.4.3 with update #656

merged 6 commits into from
Jun 7, 2023

Conversation

erinyoung
Copy link
Contributor

This is the plan that I came up with to address freyja update not being a viable option in the container (see #655).

The plan:

I took the dockerfile for 1.4.2

  • I messed with the tabs so it would look nice with my editor
  • I added in a freyja update
  • The last test is on one line instead of 2

I propose, we push this image to dockerhub and quay every week or so with github actions using the tag 1.4.2-yyyy-mm-dd of the date that we are pushing to dockerhub and quay, and overwrite the latest tag. That way, we don't have to re-write the dockerfile every time we want to update freyja's variants.

Pull Request (PR) checklist:

  • Include a description of what is in this pull request in this message.
  • The dockerfile successfully builds to a test target for the user creating the PR. (i.e. docker build --tag samtools:1.15test --target test docker-builds/samtools/1.15 )
  • Directory structure as name of the tool in lower case with special characters removed with a subdirectory of the version number (i.e. spades/3.12.0/Dockerfile)
    • (optional) All test files are located in same directory as the Dockerfile (i.e. shigatyper/2.0.1/test.sh)
  • Create a simple container-specific README.md in the same directory as the Dockerfile (i.e. spades/3.12.0/README.md)
    • If this README is longer than 30 lines, there is an explanation as to why more detail was needed
  • Dockerfile includes the recommended LABELS
  • Main README.md has been updated to include the tool and/or version of the dockerfile(s) in this PR
  • Program_Licenses.md contains the tool(s) used in this PR and has been updated for any missing

@erinyoung erinyoung requested review from k-florek and kevinlibuit May 26, 2023 16:57
@erinyoung
Copy link
Contributor Author

Freyja Version 1.4.3 came out a few days ago, so I've added that Dockerfile to this PR.

This Dockerfile contains the freyja update command, but this command only works at build time for me using both Docker or Singularity.

I don't think we need to include 1.4.2-update in the Dockerhub or Quay repo, but I built it... and it works fine... so it's been left in.

For Cecret, I've been creating my own weekly Freyja containers to keep the variants in the container up-to-date (ish). It can be found here : https://quay.io/repository/uphl/freyja?tab=tags

@erinyoung erinyoung changed the title freyja 1.4.2 with update freyja 1.4.3 with update May 26, 2023
@kapsakcj
Copy link
Collaborator

kapsakcj commented Jun 7, 2023

Dockerfiles look good to me, tests run as expected.

I pushed a small commit that adds a relative link in /README.md to link users to the freyja/1.4.3/ subdirectory.

I'm going to merge this PR and deploy the image for v1.4.3 and overwrite the :latest tag. I will skip the 1.4.2 image deployment

If you'd like to add a GH actions workflow for deploying new images every 2 weeks, I would recommend doing so in a separate pull request. In the meantime, you could trigger the "manual deploy" workflow that we typically use, and just update the docker image tag with the date of deployment, e.g. 1.4.3-2023-06-06 or whatever date you deploy the image

@kapsakcj kapsakcj merged commit 5393090 into master Jun 7, 2023
@kapsakcj
Copy link
Collaborator

kapsakcj commented Jun 7, 2023

I'll let you delete the dev branch if you are finished with it

Deploy workflow here: https://github.com/StaPH-B/docker-builds/actions/runs/5195018104

docker image should be available shortly

@erinyoung erinyoung deleted the erin-freyja-update branch June 13, 2023 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants